Auto merge of #4246 - est31:master, r=Mark-Simulacrum
authorbors <bors@rust-lang.org>
Sun, 2 Jul 2017 13:44:07 +0000 (13:44 +0000)
committerbors <bors@rust-lang.org>
Sun, 2 Jul 2017 13:44:07 +0000 (13:44 +0000)
commiteb6cf012a6cc23c9c89c4009564de9fccc38b9cb
treea0d9a6f78278b6bc0742858498cf2b388ed0dabe
parent5bf71aba8799e8866e179addafc8fe3d932f05c3
parent02c97aff86c295a1c1f9687f84302be5fb54e0d9
Auto merge of #4246 - est31:master, r=Mark-Simulacrum

Let two further tests tolerate col info in panics

Needed by https://github.com/rust-lang/rust/pull/42938

I've now ripgrepped for "panicked at" and found no further
test that hardcodes the "filename:line$" format.